+2000-10-25 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/gdkwindow.c: Include x11/gdkx.h only when building for X11.
+
+ * gdk/win32/gdkdrawable-win32.c
+ * gdk/win32/gdkimage-win32.c
+ * gdk/win32/gdkprivate-win32.h: Corresponding changes as in the
+ X11 backend.
+
+ * gdk/win32/gdkcc-win32.c
+ * gdk/win32/gdkcolor-win32.c
+ * gdk/win32/gdkfont-win32.c
+ * gdk/win32/gdkinput-win32.c
+ * gdk/win32/gdkmain-win32.c
+ * gdk/win32/gdkproperty-win32.c: Silence gcc -Wall.
+
2000-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_scroll_to_mark_adjusted): make
+2000-10-25 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/gdkwindow.c: Include x11/gdkx.h only when building for X11.
+
+ * gdk/win32/gdkdrawable-win32.c
+ * gdk/win32/gdkimage-win32.c
+ * gdk/win32/gdkprivate-win32.h: Corresponding changes as in the
+ X11 backend.
+
+ * gdk/win32/gdkcc-win32.c
+ * gdk/win32/gdkcolor-win32.c
+ * gdk/win32/gdkfont-win32.c
+ * gdk/win32/gdkinput-win32.c
+ * gdk/win32/gdkmain-win32.c
+ * gdk/win32/gdkproperty-win32.c: Silence gcc -Wall.
+
2000-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_scroll_to_mark_adjusted): make
+2000-10-25 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/gdkwindow.c: Include x11/gdkx.h only when building for X11.
+
+ * gdk/win32/gdkdrawable-win32.c
+ * gdk/win32/gdkimage-win32.c
+ * gdk/win32/gdkprivate-win32.h: Corresponding changes as in the
+ X11 backend.
+
+ * gdk/win32/gdkcc-win32.c
+ * gdk/win32/gdkcolor-win32.c
+ * gdk/win32/gdkfont-win32.c
+ * gdk/win32/gdkinput-win32.c
+ * gdk/win32/gdkmain-win32.c
+ * gdk/win32/gdkproperty-win32.c: Silence gcc -Wall.
+
2000-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_scroll_to_mark_adjusted): make
+2000-10-25 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/gdkwindow.c: Include x11/gdkx.h only when building for X11.
+
+ * gdk/win32/gdkdrawable-win32.c
+ * gdk/win32/gdkimage-win32.c
+ * gdk/win32/gdkprivate-win32.h: Corresponding changes as in the
+ X11 backend.
+
+ * gdk/win32/gdkcc-win32.c
+ * gdk/win32/gdkcolor-win32.c
+ * gdk/win32/gdkfont-win32.c
+ * gdk/win32/gdkinput-win32.c
+ * gdk/win32/gdkmain-win32.c
+ * gdk/win32/gdkproperty-win32.c: Silence gcc -Wall.
+
2000-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_scroll_to_mark_adjusted): make
+2000-10-25 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/gdkwindow.c: Include x11/gdkx.h only when building for X11.
+
+ * gdk/win32/gdkdrawable-win32.c
+ * gdk/win32/gdkimage-win32.c
+ * gdk/win32/gdkprivate-win32.h: Corresponding changes as in the
+ X11 backend.
+
+ * gdk/win32/gdkcc-win32.c
+ * gdk/win32/gdkcolor-win32.c
+ * gdk/win32/gdkfont-win32.c
+ * gdk/win32/gdkinput-win32.c
+ * gdk/win32/gdkmain-win32.c
+ * gdk/win32/gdkproperty-win32.c: Silence gcc -Wall.
+
2000-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_scroll_to_mark_adjusted): make
+2000-10-25 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/gdkwindow.c: Include x11/gdkx.h only when building for X11.
+
+ * gdk/win32/gdkdrawable-win32.c
+ * gdk/win32/gdkimage-win32.c
+ * gdk/win32/gdkprivate-win32.h: Corresponding changes as in the
+ X11 backend.
+
+ * gdk/win32/gdkcc-win32.c
+ * gdk/win32/gdkcolor-win32.c
+ * gdk/win32/gdkfont-win32.c
+ * gdk/win32/gdkinput-win32.c
+ * gdk/win32/gdkmain-win32.c
+ * gdk/win32/gdkproperty-win32.c: Silence gcc -Wall.
+
2000-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_scroll_to_mark_adjusted): make
+2000-10-25 Tor Lillqvist <tml@iki.fi>
+
+ * gdk/gdkwindow.c: Include x11/gdkx.h only when building for X11.
+
+ * gdk/win32/gdkdrawable-win32.c
+ * gdk/win32/gdkimage-win32.c
+ * gdk/win32/gdkprivate-win32.h: Corresponding changes as in the
+ X11 backend.
+
+ * gdk/win32/gdkcc-win32.c
+ * gdk/win32/gdkcolor-win32.c
+ * gdk/win32/gdkfont-win32.c
+ * gdk/win32/gdkinput-win32.c
+ * gdk/win32/gdkmain-win32.c
+ * gdk/win32/gdkproperty-win32.c: Silence gcc -Wall.
+
2000-10-24 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_scroll_to_mark_adjusted): make
gdk_gc_unref (tmp_gc);
}
-
+#ifdef GDK_WINDOWING_X11
#include "x11/gdkx.h"
+#endif
+
void
gdk_window_begin_paint_region (GdkWindow *window,
GdkRegion *region)
static void
init_true_color (GdkColorContext *cc)
{
- GdkColorContextPrivate *ccp = (GdkColorContextPrivate *) cc;
gulong rmask, gmask, bmask;
cc->mode = GDK_CC_MODE_TRUE;
gulong *pixelp)
{
PALETTEENTRY entry, closeEntry;
- HDC hdc;
unsigned int i;
entry = *color;
{
char logPalBuf[sizeof(LOGPALETTE) + 256 * sizeof(PALETTEENTRY)];
LOGPALETTE *logPalettePtr;
- PALETTEENTRY *entryPtr;
Colormap colormap;
guint i;
HPALETTE sysPal;
default_colormap ()
{
static Colormap colormap;
- gint i;
if (colormap)
return colormap;
GdkColormap *colormap;
GdkColormapPrivateWin32 *private;
Visual *xvisual;
- int size;
int i;
g_return_val_if_fail (visual != NULL, NULL);
private->xcolormap = create_colormap (gdk_root_window,
xvisual, FALSE);
break;
+
+ case GDK_VISUAL_DIRECT_COLOR:
+ g_assert_not_reached ();
}
gdk_colormap_add (colormap);
{
static GdkColormap *colormap = NULL;
GdkColormapPrivateWin32 *private;
- gint i;
if (!colormap)
{
gint ncolors)
{
GdkColormapPrivateWin32 *private;
- GdkVisual *visual;
XColor *palette;
- gint shift;
- int max_colors;
- int size;
int i;
g_return_if_fail (GDK_IS_COLORMAP (colormap));
GdkColor *color)
{
Colormap xcolormap;
- XColor xcolor;
g_return_val_if_fail (spec != NULL, FALSE);
g_return_val_if_fail (color != NULL, FALSE);
nremaining++;
}
break;
+
+ case GDK_VISUAL_DIRECT_COLOR:
+ g_assert_not_reached ();
}
return nremaining;
}
{
static char buf[100];
- sprintf (buf, "(%.04x,%.04x,%.04x):%.06x",
+ sprintf (buf, "(%.04x,%.04x,%.04x):%.06lx",
color->red, color->green, color->blue, color->pixel);
return buf;
static gint gdk_win32_get_depth (GdkDrawable *drawable);
+static GdkVisual* gdk_win32_get_visual (GdkDrawable *drawable);
+
static void gdk_drawable_impl_win32_class_init (GdkDrawableImplWin32Class *klass);
static gpointer parent_class = NULL;
drawable_class->get_colormap = gdk_win32_get_colormap;
drawable_class->get_depth = gdk_win32_get_depth;
+ drawable_class->get_visual = gdk_win32_get_visual;
+
+ drawable_class->get_image = _gdk_win32_get_image;
}
/*****************************************************
return gdk_drawable_get_depth (GDK_DRAWABLE_IMPL_WIN32 (drawable)->wrapper);
}
+
+static GdkVisual*
+gdk_win32_get_visual (GdkDrawable *drawable)
+{
+ return gdk_drawable_get_visual (GDK_DRAWABLE_IMPL_WIN32 (drawable)->wrapper);
+}
*/
#include <stdio.h>
+#include <stdlib.h>
#include <ctype.h>
#include <pango/pangowin32.h>
for (tries = 0; ; tries++)
{
- GDK_NOTE (MISC, g_print ("... trying %d,%d,%d,%d,"
- "%d,%d,%d,%d,"
+ GDK_NOTE (MISC, g_print ("... trying %ld,%ld,%ld,%ld,"
+ "%ld,%d,%d,%d,"
"%d,%d,%d,"
"%d,%#.02x,\"%s\"\n",
lfp->lfHeight, lfp->lfWidth,
singlefont->codepage = 0;
GDK_NOTE (MISC, (g_print ("... = %#x %s cs %s cp%d\n",
- singlefont->hfont, face,
+ (guint) singlefont->hfont, face,
charset_name (singlefont->charset),
singlefont->codepage),
g_print ("... Unicode subranges:"),
static GdkWin32SingleFont *
gdk_font_load_internal (const gchar *font_name)
{
- GdkWin32SingleFont *singlefont;
-
LOGFONT logfont;
char *fn;
GdkFont *font;
GdkFontPrivateWin32 *private;
HGDIOBJ oldfont;
- HANDLE *f;
TEXTMETRIC textmetric;
private = g_new (GdkFontPrivateWin32, 1);
GdkFontPrivateWin32 *private;
GdkWin32SingleFont *singlefont;
HGDIOBJ oldfont;
- HANDLE *f;
TEXTMETRIC textmetric;
- GSList *base_font_list = NULL;
gchar *fs;
gchar *b, *p, *s;
singlefont = (GdkWin32SingleFont *) private->fonts->data;
GDK_NOTE (MISC, g_print ("_gdk_font_destroy %#x\n",
- singlefont->hfont));
+ (guint)singlefont->hfont));
gdk_font_hash_remove (font->type, font);
else
return -1;
}
+ /* NOTREACHED */
+ return -1;
}
void
GdkFontPrivateWin32 *private;
GdkWin32SingleFont *singlefont;
GSList *list;
- int i, block;
+ int block;
const wchar_t *start, *end, *wcp;
wcp = wcstr;
GDK_NOTE (MISC, g_print ("%d:%d:%d:%#x ",
start-wcstr, wcp-wcstr, block,
- (singlefont ? singlefont->hfont : 0)));
+ (singlefont ? (guint) singlefont->hfont : 0)));
/* Call the callback function */
(*handler) (singlefont, start, wcp+1 - start, arg);
}
GdkImage*
-gdk_image_get (GdkWindow *window,
- gint x,
- gint y,
- gint width,
- gint height)
+_gdk_win32_get_image (GdkDrawable *drawable,
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
GdkImage *image;
GdkImagePrivateWin32 *private;
+ GdkDrawableImplWin32 *impl;
HDC hdc, memdc;
struct {
BITMAPINFOHEADER bmiHeader;
BITMAP bm;
int i;
- g_return_val_if_fail (GDK_IS_DRAWABLE (window), NULL);
+ g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_WIN32 (drawable), NULL);
- if (GDK_IS_WINDOW (window) && GDK_WINDOW_DESTROYED (window))
- return NULL;
-
- GDK_NOTE (MISC, g_print ("gdk_image_get: %#x %dx%d@+%d+%d\n",
- (guint) GDK_DRAWABLE_HANDLE (window),
+ GDK_NOTE (MISC, g_print ("_gdk_win32_get_image: %#x %dx%d@+%d+%d\n",
+ (guint) GDK_DRAWABLE_HANDLE (drawable),
width, height, x, y));
+ impl = GDK_DRAWABLE_IMPL_WIN32 (drawable);
+
image = g_object_new (gdk_image_get_type (), NULL);
private = IMAGE_PRIVATE_DATA (image);
image->type = GDK_IMAGE_SHARED;
- image->visual = gdk_drawable_get_visual (window);
+ image->visual = gdk_drawable_get_visual (drawable);
image->width = width;
image->height = height;
/* This function is called both to blit from a window and from
* a pixmap.
*/
- if (GDK_IS_PIXMAP (window))
+ if (GDK_IS_PIXMAP (drawable))
{
if ((hdc = CreateCompatibleDC (NULL)) == NULL)
{
g_free (image);
return NULL;
}
- if ((oldbitmap1 = SelectObject (hdc, GDK_PIXMAP_HBITMAP (window))) == NULL)
+ if ((oldbitmap1 = SelectObject (hdc, impl->handle)) == NULL)
{
WIN32_GDI_FAILED ("SelectObject");
DeleteDC (hdc);
g_free (image);
return NULL;
}
- GetObject (GDK_PIXMAP_HBITMAP (window), sizeof (BITMAP), &bm);
+ GetObject (impl->handle, sizeof (BITMAP), &bm);
GDK_NOTE (MISC,
g_print ("gdk_image_get: bmWidth:%ld bmHeight:%ld bmWidthBytes:%ld bmBitsPixel:%d\n",
bm.bmWidth, bm.bmHeight, bm.bmWidthBytes, bm.bmBitsPixel));
}
else
{
- if ((hdc = GetDC (GDK_WINDOW_HWND (window))) == NULL)
+ if ((hdc = GetDC (impl->handle)) == NULL)
{
WIN32_GDI_FAILED ("GetDC");
g_free (image);
if ((memdc = CreateCompatibleDC (hdc)) == NULL)
{
WIN32_GDI_FAILED ("CreateCompatibleDC");
- if (GDK_IS_PIXMAP (window))
+ if (GDK_IS_PIXMAP (drawable))
{
SelectObject (hdc, oldbitmap1);
DeleteDC (hdc);
}
else
{
- ReleaseDC (GDK_WINDOW_HWND (window), hdc);
+ ReleaseDC (impl->handle, hdc);
}
g_free (image);
return NULL;
{
WIN32_GDI_FAILED ("CreateDIBSection");
DeleteDC (memdc);
- if (GDK_IS_PIXMAP (window))
+ if (GDK_IS_PIXMAP (drawable))
{
SelectObject (hdc, oldbitmap1);
DeleteDC (hdc);
}
else
{
- ReleaseDC (GDK_WINDOW_HWND (window), hdc);
+ ReleaseDC (impl->handle, hdc);
}
g_free (image);
return NULL;
WIN32_GDI_FAILED ("SelectObject");
DeleteObject (private->hbitmap);
DeleteDC (memdc);
- if (GDK_IS_PIXMAP (window))
+ if (GDK_IS_PIXMAP (drawable))
{
SelectObject (hdc, oldbitmap1);
DeleteDC (hdc);
}
else
{
- ReleaseDC (GDK_WINDOW_HWND (window), hdc);
+ ReleaseDC (impl->handle, hdc);
}
g_free (image);
return NULL;
SelectObject (memdc, oldbitmap2);
DeleteObject (private->hbitmap);
DeleteDC (memdc);
- if (GDK_IS_PIXMAP (window))
+ if (GDK_IS_PIXMAP (drawable))
{
SelectObject (hdc, oldbitmap1);
DeleteDC (hdc);
}
else
{
- ReleaseDC (GDK_WINDOW_HWND (window), hdc);
+ ReleaseDC (impl->handle, hdc);
}
g_free (image);
return NULL;
if (!DeleteDC (memdc))
WIN32_GDI_FAILED ("DeleteDC");
- if (GDK_IS_PIXMAP (window))
+ if (GDK_IS_PIXMAP (drawable))
{
SelectObject (hdc, oldbitmap1);
DeleteDC (hdc);
}
else
{
- ReleaseDC (GDK_WINDOW_HWND (window), hdc);
+ ReleaseDC (impl->handle, hdc);
}
switch (image->depth)
if (lc->lcMoveMask & PK_ROTATION) g_print (" PK_ROTATION");
g_print ("\n");
g_print ("lcBtnDnMask = %#x, lcBtnUpMask = %#x\n",
- lc->lcBtnDnMask, lc->lcBtnUpMask);
- g_print ("lcInOrgX = %d, lcInOrgY = %d, lcInOrgZ = %d\n",
+ (guint) lc->lcBtnDnMask, (guint) lc->lcBtnUpMask);
+ g_print ("lcInOrgX = %ld, lcInOrgY = %ld, lcInOrgZ = %ld\n",
lc->lcInOrgX, lc->lcInOrgY, lc->lcInOrgZ);
- g_print ("lcInExtX = %d, lcInExtY = %d, lcInExtZ = %d\n",
+ g_print ("lcInExtX = %ld, lcInExtY = %ld, lcInExtZ = %ld\n",
lc->lcInExtX, lc->lcInExtY, lc->lcInExtZ);
- g_print ("lcOutOrgX = %d, lcOutOrgY = %d, lcOutOrgZ = %d\n",
+ g_print ("lcOutOrgX = %ld, lcOutOrgY = %ld, lcOutOrgZ = %ld\n",
lc->lcOutOrgX, lc->lcOutOrgY, lc->lcOutOrgZ);
- g_print ("lcOutExtX = %d, lcOutExtY = %d, lcOutExtZ = %d\n",
+ g_print ("lcOutExtX = %ld, lcOutExtY = %ld, lcOutExtZ = %ld\n",
lc->lcOutExtX, lc->lcOutExtY, lc->lcOutExtZ);
g_print ("lcSensX = %g, lcSensY = %g, lcSensZ = %g\n",
lc->lcSensX / 65536., lc->lcSensY / 65536., lc->lcSensZ / 65536.);
UINT ndevices, ncursors, ncsrtypes, firstcsr, hardware;
BOOL active;
AXIS axis_x, axis_y, axis_npressure, axis_or[3];
- int i, j, k;
+ int i, k;
int devix, cursorix;
char devname[100], csrname[100];
g_warning ("gdk_input_init: WTOpen failed");
return;
}
- GDK_NOTE (MISC, g_print ("opened Wintab device %d %#x\n",
+ GDK_NOTE (MISC, g_print ("opened Wintab device %d %p\n",
devix, *hctx));
wintab_contexts = g_list_append (wintab_contexts, hctx);
GDK_NOTE (EVENTS,
g_print ("gdk_input_win32_other_event: window=%#x (%d,%d)\n",
- GDK_WINDOW_HWND (window), x, y));
+ (guint) GDK_WINDOW_HWND (window), x, y));
#else
/* ??? This code is pretty bogus */
x = pt.x;
y = pt.y;
GDK_NOTE (EVENTS, g_print ("...propagating to %#x, (%d,%d)\n",
- GDK_WINDOW_HWND (window), x, y));
+ (guint) GDK_WINDOW_HWND (window), x, y));
goto dijkstra;
}
gboolean need_ungrab;
GdkDevicePrivate *gdkdev;
GList *tmp_list;
- gint result;
tmp_list = gdk_input_windows;
new_window = NULL;
need_ungrab = FALSE;
GDK_NOTE (MISC, g_print ("gdk_input_win32_grab_pointer: %#x %d %#x\n",
- GDK_WINDOW_HWND (window),
+ (guint) GDK_WINDOW_HWND (window),
owner_events,
- (confine_to ? GDK_WINDOW_HWND (confine_to) : 0)));
+ (confine_to ? (guint) GDK_WINDOW_HWND (confine_to) : 0)));
while (tmp_list)
{
gdouble *axes,
GdkModifierType *mask)
{
- gint i;
-
g_return_if_fail (device != NULL);
g_return_if_fail (GDK_IS_WINDOW (window));
_gdk_windowing_init_check (int argc,
char **argv)
{
- gint i, j, k;
-
#ifdef HAVE_WINTAB
if (getenv ("GDK_IGNORE_WINTAB") != NULL)
gdk_input_ignore_wintab = TRUE;
GdkGC * _gdk_win32_gc_new (GdkDrawable *drawable,
GdkGCValues *values,
GdkGCValuesMask values_mask);
+
+GdkImage* _gdk_win32_get_image (GdkDrawable *drawable,
+ gint x,
+ gint y,
+ gint width,
+ gint height);
+
COLORREF gdk_colormap_color (GdkColormap *colormap,
gulong pixel);
+
HRGN BitmapToRegion (HBITMAP hBmp);
gchar *gdk_font_full_name_get (GdkFont *font);
case GDK_SELECTION_TYPE_STRING: return g_strdup ("STRING");
}
if (atom < 0xC000)
- return g_strdup_printf ("#%x", atom);
+ return g_strdup_printf ("#%x", (guint) atom);
else if (GlobalGetAtomName (atom, name, sizeof (name)) == 0)
return NULL;
return g_strdup (name);
(prop_name = gdk_atom_name (property),
type_name = gdk_atom_name (type),
g_print ("gdk_property_change: %#x %#x (%s) %#x (%s) %s %d*%d bytes %.10s\n",
- GDK_WINDOW_HWND (window), property, prop_name,
- type, type_name,
+ (guint) GDK_WINDOW_HWND (window),
+ (guint) property, prop_name,
+ (guint) type, type_name,
(mode == GDK_PROP_MODE_REPLACE ? "REPLACE" :
(mode == GDK_PROP_MODE_PREPEND ? "PREPEND" :
(mode == GDK_PROP_MODE_APPEND ? "APPEND" :
length++;
#if 1
GDK_NOTE (MISC, g_print ("...OpenClipboard(%#x)\n",
- GDK_WINDOW_HWND (window)));
+ (guint) GDK_WINDOW_HWND (window)));
if (!OpenClipboard (GDK_WINDOW_HWND (window)))
{
WIN32_API_FAILED ("OpenClipboard");
#endif
hdata = GlobalAlloc (GMEM_MOVEABLE|GMEM_DDESHARE, length + 1);
ptr = GlobalLock (hdata);
- GDK_NOTE (MISC, g_print ("...hdata=%#x, ptr=%#x\n", hdata, ptr));
+ GDK_NOTE (MISC, g_print ("...hdata=%#x, ptr=%p\n", (guint) hdata, ptr));
for (i = 0; i < nelements; i++)
{
*ptr++ = '\0';
GlobalUnlock (hdata);
GDK_NOTE (MISC, g_print ("...SetClipboardData(CF_TEXT, %#x)\n",
- hdata));
+ (guint) hdata));
if (!SetClipboardData(CF_TEXT, hdata))
WIN32_API_FAILED ("SetClipboardData");
#if 1
gdk_property_delete (GdkWindow *window,
GdkAtom property)
{
- gchar *prop_name, *type_name;
+ gchar *prop_name;
extern void gdk_selection_property_delete (GdkWindow *);
g_return_if_fail (window != NULL);
GDK_NOTE (MISC,
(prop_name = gdk_atom_name (property),
g_print ("gdk_property_delete: %#x %#x (%s)\n",
- (window ? GDK_WINDOW_HWND (window) : 0),
- property, prop_name),
+ (window ? (guint) GDK_WINDOW_HWND (window) : 0),
+ (guint) property, prop_name),
g_free (prop_name)));
if (property == gdk_selection_property)
projects / gtk4.git / commitdiff